Merge "[Mainline] Missing android.system APIs migration"