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

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

Change-Id: I04007d1606d9173699a1e7e2626d0a4a78c09bca