[automerger skipped] Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a am: ac811c4025 am: 0ab80262df -s ours
am skip reason: Change-Id I6a481a9d2363997bf954f248d08224c79f0c2afb with SHA-1 6415a1505a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4b6c973cec872bdfe98eb8bc4ef0adac63c4cf8
This commit is contained in: