Merge changes from topic "am-193ce2a5260b4c7a87a337803af47852" into...

Merge changes from topic "am-193ce2a5260b4c7a87a337803af47852" into tm-qpr-dev-plus-aosp am: 1850ae0b am: bc7d0966

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



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