[conflict] Merge changes from topic "framework-nfc-updatable" into main am: 04a158bf

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



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