Merge changes from topic "presubmit-am-d779dce131b641afa9cae2d4523c3036" into sc-dev-plus-aosp am: 66f5690f am: d5e00e65

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

Change-Id: I3f1e66aaa09d94049f39284f22251db4cbabdc5c