Merge "Introduce a LazyJniRegistrar helper class for system server" into main