Merge changes I14740854,Id1c2dc28,I4168c868 am: 3b0cb56475

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I299178722859a6f0dc1beb6cc41890c63fbf6d0f