Merge changes I8d3b81a5,I36a6c9f1 am: 0976b5d9ab

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

Change-Id: I1950cc09b5f67206716ff430dc49e2a1a333a5e6