Merge changes I77e34a92,I8f13159b,Ic8ab66ff,Id9494f69 am: e19a117397 am: f9f0f6f10b am: 887eac8d5e

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

Change-Id: Ie2ec6f0a2eb26283ff0058ada398a81ccaaccc04