Merge changes from topic "am-2939ec81b46a4353bcae6fdff7a1a6e1" into...

Merge changes from topic "am-2939ec81b46a4353bcae6fdff7a1a6e1" into sc-qpr1-dev-plus-aosp am: adfd7056 am: 1a47579e

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

Change-Id: I613ed664f76520b9fdec0e3b35cc2f7b99cd9c14