Merge "Mark constructor as static" into sc-dev am: b98bc39d9f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/15105506

Change-Id: I72a0be583b2f50cc8cb4d0c2504ac20bb5dc30ff