Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208 am: beb9c4fe58

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

Change-Id: Ia65bd1446439b3816e2941fa12de39f7f8015025