Merge changes from topic "am-6edfa0d45b204ee2885798a044e33cd8" into tm-dev am:...

Merge changes from topic "am-6edfa0d45b204ee2885798a044e33cd8" into tm-dev am: 6397b1e3 am: c26e4a13 am: e30af8e8

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



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