[automerger skipped] Merge "Add 8k bitmap render support" am: 0925c746 am:...

[automerger skipped] Merge "Add 8k bitmap render support" am: 0925c746 am: 6b56a46e am: 34b2e597 -s ours

am skip reason: skip tag Change-Id I582883cca51d42505ec8a81044e471998b88854b with SHA-1 0e717a9d is already in history

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

Change-Id: I587e7f5845646e47c13cb0f57b51fcdbd9cb8629