Merge changes I623e2983,I8b95e020 am: ec1966e372 am: bf84b9239b am: 441c5bc2e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479476

Change-Id: Iacf53dd5c4747e7d394d8aa1f6de2d66bfd80cca