Merge changes from topic "presubmit-am-1818a89739a448418e0c5e26a456a077" into sc-qpr1-dev am: 64799a58 am: 6cea51c9

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

Change-Id: Ica33066afe62d1adba4062cd880dfee3e4b5b816