[automerger skipped] Merge "Merge "Move the app to /system_ext" am: c8e4d7953e" into stage-aosp-master am: 38b21bca73 -s ours am: 10a451b563 -s ours
am skip reason: Change-Id Icd2f7fc7021e84fad9980d58688dc640ca4245f8 with SHA-1 68da89b6d8 is in history

Change-Id: Ib78d755490c32e3bc4e776cbba059b26136becef