[automerger skipped] Merge "DO NOT MERGE: Fix a few issues with foreground...
[automerger skipped] Merge "DO NOT MERGE: Fix a few issues with foreground service location accesses." into qt-dev am: 80e9a4cc
am: 57eaa9df -s ours
am skip reason: subject contains skip directive
Change-Id: I33d9f08ad4ab71d6cff457168f26b0e3b71c8d0e