Merge changes I08df6527,I16a5537e into tm-dev am: 26f54bd1 am: 9a9dbe54 am: 74fb6e3c

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



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