Merge "Add 8k bitmap render support" am: 0925c74679 am: 6b56a46ed5

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

Change-Id: I0c3fe22a521e970f677d3f570e7869f320a68ea7