Merge "Don't display the option menu when all option menu items invisible" into stage-aosp-master am: 96545e7f9c  -s ours am: 4fcf3feb8d  -s ours
am: 1b16b44ce1  -s ours

Change-Id: I83bec6861378e9f29a8863cb027d69a6c2417b66