Merge changes from topic "presubmit-am-a48f52096e034a1e945d85dd74e1d766" into tm-mainline-prod am: e12157d8

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



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