Merge changes from topic "am-35c5d91315624a65bf91e50119c5867f" into tm-qpr-dev am: c926ca7c

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



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