Merge changes Id4632e1b,I31985822,Ibbf96a25 am: e087ceed21

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

Change-Id: Iabe10bcb42333e1046add1be5090c19733b7887d