Merge "[automerger skipped] Security fix for VPN app killable via lockscreen. am: 0fddfa039d am: 0ee0a19870 -s ours am: 458b7eb721 -s ours am: 7196f1d331 -s ours am: 85fd5aad26 -s ours" into main