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

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

Change-Id: I239fa913b4465f9cb67984627923e86f0a5f1779