[automerger skipped] Fixed button bar hiding permissions screen.
am: dc84a4d936  -s ours

Change-Id: I213bc3c1089a2a23b4f87b79247703c8292352d5