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

Change-Id: I471bc8f93034a278220011927e22b8d636ff7876