Merge "[automerger skipped] Move the app to /system_ext am: 1a1c3c55d2 -s ours am skip reason: change_id If15f854a33aef9098c1ff27bad2a3b49742b633b with SHA1 38ea556643 is in history" into stage-aosp-master am: 84dc850deb -s ours
am skip reason: Change-Id If15f854a33aef9098c1ff27bad2a3b49742b633b with SHA-1 38ea556643 is in history

Change-Id: Ieb63c95d03f57f24cce9d6843ccb453273868348