Merge changes I14740854,Id1c2dc28,I4168c868 am: 3b0cb56475 am: 06085e6ab3 am: f5d4826ef1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied6022110fd73b4880a4a34caba03ae821e111a7