Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-dev-plus-aosp am: 2bced2c8 am: 80ac314d

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

Change-Id: I1f2f400e5dc2b160bece60900852c57f680b5ed6