Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad89c am: d0b3871438 am: aa12866f78

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

Change-Id: I4d425c0cdab7fb86dc3dcf134c3d4dafb7c4b47a