Merge changes Iad41fa42,Ie37173d0,Ib923eafb,I9bff481a,I631f5e01, ... am: cc7dec54ab am: 62afa55bb9

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

Change-Id: I21281b1823499bc3fb6490854c8bc56bd4b61ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>