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

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

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