[automerger skipped] Merge changes from topic "ccassidy-sbil" into tm-qpr-dev...

[automerger skipped] Merge changes from topic "ccassidy-sbil" into tm-qpr-dev am: 758b4a3e am: 7d25437c -s ours

am skip reason: Merged-In I811481558ba16f475bdff36c1b1b2b0501aa1216 with SHA-1 351e7dcd is already in history

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



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