tree 1443e8741df9aa77cb6410d23f52c97df24fe96b
parent 6072de17cd812daf238092695f26a552d3122f8c
parent a790490ec973cd1799384a367da59d0200591c0a
author android-build-team Robot <android-build-team-robot@google.com> 1598283042 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598283042 +0000

Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743, 12364605, 12363956, 12363957, 12363958, 12364309, 12364483, 12364484, 12364564, 12364333, 12364334, 12364335, 12364336, 12364337, 12364607] into rvc-release am: a790490ec9

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12364682

Change-Id: I5d460e022ec749177c37301bed64f48d8b8d272e