[automerger skipped] DO NOT MERGE Have volume UI dismiss on home button press. am: 25400fdcb9 am: e5eca9739d -s ours
am skip reason: subject contains skip directive Change-Id: I84c6614bae1c53cbd69f3b28518da3bf8556047b
This commit is contained in: