Revert "[DO NOT MERGE] How to add ambient display to builds"

This reverts commit 93dfbf1a4a0aafea4e08849bbfcb9ed181c24787.

Change-Id: Ibeb813e754496adfe63b2c7420da842a19233712
Merge "Revert "[DO NOT MERGE] How to add ambient display to builds"" into EXODUS