[automerger skipped] Update logic for detecting pre-apexd services to check that the ART APEX is mounted. am: cacf04351f am: 4c063099a2 am: 477400792f am: c1f8fbd53a
am: db41c101ee -s ours
am skip reason: change_id Ibab4f5f7a243d0815b9c70a537bae8d77dee2fbb with SHA1 b0c7da28e8 is in history

Change-Id: Ie5a53c27ed0d88a25e7ca2a704eea0f9f619df25