Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am:...

Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am: b468efc7 am: e0047a81 am: 2bd8b046

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



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