Merge changes from topic "am-bef799ddf8b443e09450c0c28fa5d41f" into tm-d1-dev...

Merge changes from topic "am-bef799ddf8b443e09450c0c28fa5d41f" into tm-d1-dev am: e48d398e am: 16ccd1fc

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



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