Merge changes I5dcaabaa,I998cf688 am: 8dddad53d5 am: c1b51c398b

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

Change-Id: I18aa4a6180cea3565b9f92f0033d50aafb28cc64