Merge "[automerger skipped] Merge "Merge SP1A.211205.008" am: a201cdea am: 6d6f626a -s ours am: 9fda6e53 -s ours" into sc-v2-dev-plus-aosp