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

Merge changes from topic "presubmit-am-b2dcf94a336a41e18a9370da4e132cfa" into sc-qpr1-dev am: 27c44233 am: ccdd9f43

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

Change-Id: I13a9748277d4092c0d849e757d81474a72f1a806