Merge changes from topic "presubmit-am-b1e8854305b244f1a96abfcc97b3ccd7" into...

Merge changes from topic "presubmit-am-b1e8854305b244f1a96abfcc97b3ccd7" into sc-qpr1-dev am: 544a7010 am: f197307d

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

Change-Id: Id231045612736902d801762e195d1d45cce43017