[automerger skipped] Merge "[DO NOT MERGE] Revert "Temporary flag for Launcher...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Temporary flag for Launcher to debug their usage of sandboxed display APIs"" into sc-v2-dev am: 0658235d am: 12d3945a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16273554

Change-Id: I3ca7e6b12de2d9af4a5174ab1eb014dbf81597f7