Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa10 am: e15e9f41...

Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa10 am: e15e9f41 am: 5c40f952 am: 568a9b21

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



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