Merge "Fix CTS test for checkCallingOrSelfPermission" into lmp-dev