Merge "Stop registering android.hidl.token" into main