Merge "Set ObserverInternal mitigation to zero when it's not present" into main am: c050494b8e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3063001

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