Merge "Use checkOp instead of noteOp in AccountManagerService." into qt-dev
am: 08e41f1114

Change-Id: Icfbc4349c938440734e466faf3c8eb95a9f6882e