am 0f933c9a: Merge "Fix behavior of AnimationSet and fillBefore"

* commit '0f933c9a32dfdc10dbb14fa11c7815541efe22bb':
  Fix behavior of AnimationSet and fillBefore