Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev
am: 5a50cb42b7

Change-Id: I60169422c51d12b19bb24e997ec9a2a98fffa2ea