Ready to Add PAC Settigns app into settigns app
remove duplicate classes
PART 1 OF 2

Change-Id: I514af7b74617611c6023174adaf73d9d6dcef66b