[DO NOT MERGE] Bring back overlay warning in permissions UI. am: 92d61dd689 am: 8fd7c4286e am: 385ae0e0df am: cd522256f0  -s ours
am: 263095df7e

* commit '263095df7ed32a410f3f957a4b681818051ef313':
  [DO NOT MERGE] Bring back overlay warning in permissions UI.

Change-Id: I39152d520147cf2c1b98a51a77b92d24823ddf92