tree eb9b2325ad0e3d2ff7e59641356fb526c345905d
parent 02b4bc1e224764ae072c6441a7af00e148a0a176
parent dca10da84991cb9cda0202221c61ddebee4be265
author Tyler Gunn <tgunn@google.com> 1546962966 -0800
committer android-build-merger <android-build-merger@google.com> 1546962966 -0800

Merge "Ensure null media player does not crash Telecom." am: 3f3349b92d
am: dca10da849

Change-Id: Ie0a48ba94d0ebb06758d09501497011d473a770a