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

Merge "ResourceManager stability improvements" into tm-dev am: 0859eb92 am: 459232f3 am: a9db2750

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



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