Merge "Address comments on ag/14486203" into sc-dev am: dc9b300cf3 am: 5783571258
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540395 Change-Id: I0aa9480f278d719c03fbfc84eacd40e1f5a39698
This commit is contained in: