Merge changes Ifa2aa335,I09366a7f am: 708c77d236 am: 7c2b530a09 am: c810356573

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ac2a510eb5837acd77b2d7884da0af14cca502f