Merge "Fix content insets calculation error when taking task snapshot." am:...

Merge "Fix content insets calculation error when taking task snapshot." am: fe0504b2 am: 6f82d999 am: e8186437 am: f2b76be6

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

Change-Id: Ic94a91653c0f6fd8b4de71e1712558bf353e81eb