Android 5.1.1 release 10
Block overflow menu during setup. DO NOT MERGE

Bug 19866981.

Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
(cherry picked from commit 75fc9080a83881e5d8961eb21caa93496a84483e)
1 file changed