Merge "nfc(api): Restore constructor to previous version" into main am: cc36a901ef am: 35f75ef298 am: 2ab3d9b99e

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

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