Merge changes from topic "am-5a260d7a3a36453baaa193de01b619b6" into tm-qpr-dev-plus-aosp am: 6713b395

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



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