[automerger skipped] Allow for reschedule-able messages am: b0174272 am: a2b15750 -s ours

am skip reason: Merged-In Id5e76060f1d021f5ea30690cca7dd108dcf8c51d with SHA-1 352fec52 is already in history

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



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