[automerger skipped] Merge "Add letterboxInsets to TaskSnapshot" into...

[automerger skipped] Merge "Add letterboxInsets to TaskSnapshot" into sc-v2-dev am: 442ba547 am: c7b00cdf -s ours

am skip reason: Merged-In I7daa01d7e6d2df2bc1b85d12004e7927d61d0e03 with SHA-1 d46b321e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16149035

Change-Id: I592d654c7575e021c769ece166b0798955a6e2a3