Merge changes I28e39400,Ibada8b42 am: a34c401619 am: 6c1a0bbf28 am: c65cf828d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548870 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I86031cca3685b4e0d2d48d9e339cf1a314f42b3c
This commit is contained in: