Merge changes Ib7d4be70,Ia0f12e9b,I540c2900,Ife9ad043,Ie81c995b, ... am: f501120399 am: 60e50ffb9a am: 59fe19b6ff

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

Change-Id: I6a87d766180c45c9a8ee758a067126d358df44ea