Fix clang-tidy warnings in apmanager.
am: 2946762690

Change-Id: I4eaba8276e2f6fb0e1a0a935c869ce0de63cf304