Merge "Add max target sdk for LocalActivityManager"