[automerger skipped] Merge "Added intro lottie for foldable." into tm-qpr-dev am: bc38bacaf2 am: bd91183ac8 -s ours
am skip reason: Merged-In Ic9e95dd650dd5018d13751d251fdac53e1fb13d0 with SHA-1 9127c1192a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20347039
Change-Id: I4b07980e50ec186549fc6e3fd37a5058c80b1e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: