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

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

Change-Id: I3444645bc42e1216c612ae7c58cb88cb2dae0a4b