Merge changes from topic "267565290" into tm-qpr-dev am: 7dd0196e

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



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