Merge changes from topic "209701404" into tm-mainline-prod am: 284c9ee3

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



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