Merge "AImageDecoder: respond to API feedback" into sc-dev am: 5487967eab am: 8a1229fd9a am: 583f3df56e

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

Change-Id: I4bf319bd5784e482039c9ee0e4609c38b7c409aa