am 788dd73c: am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev

* commit '788dd73c9e96f77370f8a787d3c25c8ff741de64':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)