Merge "Import ActivityManager inner classes directly" into tm-qpr-dev