[automerger skipped] Merge "Move the app to /system_ext am: a7a82f54a0" into stage-aosp-master am: 117ebd53f2 -s ours
am skip reason: Change-Id I62bb7af418764e0871649a98a296493d7e32a5ec with SHA-1 a7a82f54a0 is in history

Change-Id: I9cf276c2f6c36bd59643e844a706e7a3c0769410