am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse

# Via Adam Powell (1) and Android Git Automerger (1)
* commit 'cef582ab0346afdaff9190565d432a9468ecdd7d':
  Fix re-enabled state of up after action view collapse