Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: 2344f506

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



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