Merge "Prepare ActivityInterceptorCallback to be unhidden to mainline modules."