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

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



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