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 am: ffcc2a7f -s ours

am skip reason: Change-Id Ib9df71192937164ff95ce564195d5d68508ec69d with SHA-1 86e560c7 is in history

Change-Id: I8ab57954816b230834e740e66e014f204b21ac17