Merge changes from topic "presubmit-am-d5aeba84add64a9a9dd59331ecf1ff06" into sc-qpr1-dev am: effda99679
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16793875 Change-Id: I603707c6b684569f78a97acfd09918c759557193
This commit is contained in: