Merge "Ensure MediaSessionCompat handles null metadata without NPE API 14-19" into lmp-mr1-ub-dev