Merge changes from topic "am-3fb17e9a763546429c67d547e31aea06" into tm-qpr-dev...

Merge changes from topic "am-3fb17e9a763546429c67d547e31aea06" into tm-qpr-dev am: f008c5bb am: de851eb2

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



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