Merge "[automerger skipped] Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" into rvc-dev am: 19f09b23 -s ours am: 3bb4cf94 -s ours" into rvc-d1-dev-plus-aosp