Merge changes I50be6848,I6f88c028 into main

* changes:
  [Thread] use Context#enforceCallingOrSelfPermission
  [Thread] make InfraInterfaceController mockable