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

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



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