Merge changes I4f49bb96,I8c8ee829 into tm-dev am: 0423dff2 am: 41c3f95e...

Merge changes I4f49bb96,I8c8ee829 into tm-dev am: 0423dff2 am: 41c3f95e am: f4fdb888 am: 4e2332d3

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



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