Merge changes I8d3b81a5,I36a6c9f1 am: 0976b5d9ab am: 106f35942c am: 08673eb286

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

Change-Id: Iaea4e88f57bda82f8fd5fa9f7c186981d8f5b10c