Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe am: 6cece1f221

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

Change-Id: Icf3acbfb071fc2d24f0d31c719446604567e2281