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

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

Change-Id: I51d85e1f2641405ac22f47e06c15d0df42ddc835