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

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

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