Merge "Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" am: 4db4933c am: 288837ff" into rvc-dev-plus-aosp