Merge changes I4256ca5f,I91528e1a,I48bd594c am: be331ab3a7 am: 22679c8f68

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5304f83bc029582c2f903669270b713b1678431c