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

Merge changes from topic "presubmit-am-a4905c0263fe4b63a3e22407af07914e" into sc-qpr1-dev am: ed4d7fd7 am: 8b83ada6 am: bc3e5316

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

Change-Id: Idb29c5a865dbfea183a8d28c5a3e899617565c51