Merge "Suppress OnNameExpected lint for ComponentCaller APIs in Activity" into main