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

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



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