Merge "Add metaData null check in isRequiredAppDeclaredInMetadata" into main am: 23311d456a am: 44115cf7c3

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

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