[automerger skipped] Merge "Add system_ext_manifest.xml" into rvc-dev am:...
[automerger skipped] Merge "Add system_ext_manifest.xml" into rvc-dev am: cc62281b am: 7573d97c -s ours am: 15f087ba -s ours
am skip reason: Change-Id I38d4861f433b307574a1b3fae0d912833dfa35e3 with SHA-1 382bbdf2 is in history
Change-Id: Ib560c5d4426f384c763f8a0ab3fad5196b2626a5