Merge mainline-release 6664920 to master - DO NOT MERGE am: 8469743b49

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

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e