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

Merge changes from topic "presubmit-am-ebb30f757e84472c86693a80953f851a" into sc-qpr1-dev am: 8491a267 am: 5de85ec0

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

Change-Id: If3dae0a34ece349d6be23fc7dfcaff985e3e1f11