Merge changes I67e5fa23,I223b207c am: 32f5d14cef am: 4dc9bb97c4

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

Change-Id: Idc58f24797aa1e3d24058a024b1ea31199f46353