Merge changes I4f49bb96,I8c8ee829 into tm-dev am: 0423dff2 am: 8155e761...

Merge changes I4f49bb96,I8c8ee829 into tm-dev am: 0423dff2 am: 8155e761 am: 35f4f994 am: a32e7324

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



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