Merge changes from topic "am-197d7547c75c471a92ea5e0dcb59a884" into...

Merge changes from topic "am-197d7547c75c471a92ea5e0dcb59a884" into tm-d1-dev-plus-aosp am: 67d038b4 am: a78473c2

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



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