Merge "Make addOnActiveSessionsChangedListener system API"