Merge changes I96b17c78,If4b09f5b into tm-dev am: e6a860a7 am: 7435a70a am: 7c448ea1 am: 1764eaa0

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



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