Merge changes I30579090,I7a725647 into tm-dev am: fb0f8533 am: c351acab am: 1ee97e0e

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



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