Merge changes from topic "am-40f13d43c4e247b4b9accac9860d62d9" into...

Merge changes from topic "am-40f13d43c4e247b4b9accac9860d62d9" into sc-qpr1-dev-plus-aosp am: 17b94d21 am: 84beccc0

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

Change-Id: Id8b6a1778f6c6da653a3e7bde1572c3a77b250dc