Merge external/lottie from aosp/upstream-master into aosp/master am: d5ae520ccb
am: 95efd48bae

Change-Id: I0a70b07bd2feba629ca49e014dda89e53a78a579