Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into...

Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into sc-v2-dev-plus-aosp am: dd244b19 am: e0cf3e3a am: ad2ec48f

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

Change-Id: I4c52ff02eecf4383bb52956f8bb3033b056c2713