Merge changes Ib7d4be70,Ia0f12e9b,I540c2900,Ife9ad043,Ie81c995b, ... am: f501120399

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

Change-Id: I06e09b0da377a18f29f3cab335baaa537ec0e0ba