Merge changes from topic "261420432" into tm-qpr-dev am: b200ac2c am: 4a8fbc87

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



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