Merge "TEMP" am: 844e7e7f6b am: 1888a8a8d1 am: a2ab613738

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

Change-Id: I2a10e5d8b0c5496bf7e4ce93aab8fbd4d0568e99