Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a am: 943891c2...

Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a am: 943891c2 am: e0384a77 am: e121b9a2

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



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