Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 4344b7f953

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f