[automerger skipped] Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev am: 5a50cb42b7
am: eef39badae -s ours
am skip reason: subject contains skip directive

Change-Id: I7ad95ea52af6ddf1a30d6eeecc6b91d1826f3df3