[automerger skipped] Merge changes from topics "pass-res",...

[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c am: 93237552 -s ours am: 798f6db9 -s ours am: d9572716 -s ours

am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 0ed433e4 is in history

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

Change-Id: I05bbffec3b2ae92a254c5f66ad90b5dd85babb5b