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

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

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