Merge changes from topic "presubmit-am-62c24e32cf454b58991df46fc5f21f70" into sc-qpr1-dev am: a3d7354ae9

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

Change-Id: I9a42038cefb74c98f72f7eccec9e25647be13ec8