[automerger skipped] Merge "Use index mask when there is no valid input mask...

[automerger skipped] Merge "Use index mask when there is no valid input mask from output mask." am: a646890c am: c9168aae am: 9ae38a68 am: eb1211df am: de9f20c9 -s ours

am skip reason: Merged-In Ie6b5d80899a7eeea1fcb88fcdf8cd50bc1a97321 with SHA-1 73e303cb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2218787



Change-Id: I7209e1f8fe14c0fc5368b633c2df9904cdb7f1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>