Merge changes I623e2983,I8b95e020 am: ec1966e372 am: bf84b9239b

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

Change-Id: I8fa040d1156b88de203e6e6f1ddb776faf0ba82c