Merge changes Iaaefbeb2,I3eb47392 into sc-dev am: d73b838304 am: d8bc58960c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14650174 Change-Id: I2f5ff86cbd037ec06b00088271d5b51e75b03c74
This commit is contained in: