Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b14 am: 4247c39cd5

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

Change-Id: Id6b9fcc31777ad33abfaee2a11e07df92766cd32