Merge changes I5cd2982f,Ia7f44c5f am: 8d6d8dcc4f am: 0ec026914a

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

Change-Id: Iecc6f5557814fd635416a74e716e26571237e2f9