[automerger skipped] Merge changes from topic "apps_to_system_ext" am: 046d939399 am: b09797a099 -s ours
am skip reason: Change-Id I0662674a66bc54ee4713e5c7ed6ad0db4d342338 with SHA-1 2f4deb666e is in history

Change-Id: I2c64e8886f07e0b6f062bcb64d33bd81c525af46