Merge changes from topic "presubmit-am-c36a899a15cc428c9d8f898ef539dfc2" into sc-qpr1-dev am: 58b23faf am: 206f4971 am: df516909 am: e15dd1ec

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

Change-Id: I47b8a08e4a21ba42f71223f48c444e95e323d4c2