Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe

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

Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9