Merge changes from topic "presubmit-am-d5aeba84add64a9a9dd59331ecf1ff06" into sc-qpr1-dev am: effda996 am: a9782e72 am: fa5b43ae

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

Change-Id: I7f15c756afa3b7723539c04384e835aecf1a8b06