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

Change-Id: Id6961509a549a849f473c6169d92f4497db8e117