Merge "Exposed some testAPIs in ActivityManager" into sc-dev