Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 96ccce1940 am: 7329e83d2f am: b214f23e61

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79c5b8919396827d281fcd04dced649847e9a038