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

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

Change-Id: Icb691f8a500a6599518036ac77e5343205cc0079