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