Merge changes from topic "am-bd58400214574d7baaa8e2c0f21adba3" into...

Merge changes from topic "am-bd58400214574d7baaa8e2c0f21adba3" into sc-qpr1-dev-plus-aosp am: f6df651a am: 7c3cc33b

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

Change-Id: I890d97c379f4796df760102a932641c731f2e957