Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev
am: af6cb35749

Change-Id: Ica02002122fe7b5eb579482091336ed87a5dad20