Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev
am: 47e4fde159

Change-Id: Ic154e4fea33cbec26407598325c44a4dcbbcceb7