Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107

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

Change-Id: Ie78c9ad9ed65eefa8a4c8f6146eccf9847709659