Merge changes I8c36f5af,I800bc352 am: 9acfdcf214

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

Change-Id: I5b6c9dc465cd733569ec33afacee530e5b27eb11