[automerger skipped] Merge "Merge "Move the app to /system_ext" am: 24df85c79c" into stage-aosp-master am: 7623fb5bc7 -s ours
am skip reason: Change-Id Ia727541b31d206d8106bfe66f6afb70d639224de with SHA-1 969de8f943 is in history

Change-Id: Ie7c2cd72aa326edfa0c3ebfbc207714a7bb65bb0