Merge changes I982543cd,I41c3bf6c,Id3e5f6e1 am: 86d837daa8 am: e5334a1b25

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

Change-Id: I780dbee953862c6c49200f32d74fad66607a7474