Merge "Marking SessionParams#setDontKillApp as public API"