Merge changes from topic "presubmit-am-67ba33c090484110ac10516a3ae9f95e" into sc-dev-plus-aosp am: 3696edd2 am: aaef8144

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

Change-Id: I20c706c7eb0e30bd175215d26711eb62aca25873