Merge changes from topic "presubmit-am-1f589f278e0b4cd4bdc898353c994c9d" into...

Merge changes from topic "presubmit-am-1f589f278e0b4cd4bdc898353c994c9d" into tm-mainline-prod am: 941cfd7d

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



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