Merge changes from topic "presubmit-am-ef6979eb0d794319a4c16a36a338836c" into sc-qpr1-dev am: b4488645 am: bd95253f

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

Change-Id: I9e44fc730185d91ac033f3001737e77d6b16db9b