Merge changes from topic "presubmit-am-fbfa3bdd2cb9460bb4af78a6f252a34b" into sc-dev-plus-aosp am: d8254d87a6 am: f7d707bc77

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

Change-Id: I1709b1300f491c6b19c5ab5c3c4f10eb77a915c3