Merge changes from topic "am-476cc199c5974285b2f4db9e4b05d071" into tm-qpr-dev-plus-aosp am: 9aaa6e3b am: 8e489ed6 am: 595de52d am: 4ab95cdd

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



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