Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-qpr1-dev am: 33d52c3daf am: 217c452c7f am: 6df6352e7d

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

Change-Id: Idd5289ab3c9d0f2be5331fec94bf78f70b5d507a