Merge \"Revert \"Prevent apps to overlay other apps via toast windows\"\" into nyc-mr1-dev
am: 78fa7a1b3f

Change-Id: I30b84189b2c2c4566c837cd1b8837053d6944988