Merge changes from topic "presubmit-am-6eb6cc390f284836ade6930c3dc57a3a" into sc-dev-plus-aosp am: faa99892

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

Change-Id: I40abcf275749e236a1babe3db4bc50c97cdb8508