Merge changes from topic "am-da24a5d14aaf444eacbf3a1814c322cc" into tm-d1-dev-plus-aosp am: 36cfa22c am: 0d7117ff

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



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