Merge changes I623e2983,I8b95e020 am: ec1966e372

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

Change-Id: I39e260b987fcc371028107bc683f67f1b8833727