Merge changes Iccf50955,I17ab54dd am: 92ed348a am: 7d85933c am: fa29af80 am: 7126988e am: 159eb61b

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



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