Merge "Fixing null pointer error in CTS AudioManagerTest" into lmp-dev