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

Change-Id: If5fa613b100a5d216575ad4f53523f706edcfc07