Merge "Maps crashed entering PIP right after... am: 598c497be3  -s ours am: 1ee0381c7e  -s ours" into oc-mr1-dev-plus-aosp
am: 883d71d2cd  -s ours

Change-Id: I3148fc5b4709b59732e3c73bbafc0416a9ccf32b