base

Fix incorrect content description on action bar home/up

Some stray code from a previous change caused an erroneous content
description to be set on the wrong view in the action bar. Correct
this and sync with the right behavior.

Bug 10969992

Change-Id: I4deaa3528b4bc222e25354679fa93f8316fa2d70