Merge "ResourceManager stability improvements" into tm-dev am: 0859eb92 am: c237504f

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



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