Merge changes from topic "b238333941" into tm-qpr-dev am: 3c7368d8 am: d4b0b155

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



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