Merge "[AAPM] Return null service for unsupported form factors." into main

                        @Override

                        public AdvancedProtectionManager createService(ContextImpl ctx)

                                throws ServiceNotFoundException {

                            IBinder iBinder = ServiceManager.getServiceOrThrow(

                            IBinder iBinder = ServiceManager.getService(

                                    Context.ADVANCED_PROTECTION_SERVICE);

                            IAdvancedProtectionService service =

                                    IAdvancedProtectionService.Stub.asInterface(iBinder);

                            if (service == null) {

                                return null;

                            }

                            return new AdvancedProtectionManager(service);

                        }

                    });