Merge changes from topic "ccassidy-sbil" into tm-qpr-dev am: 758b4a3e

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



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