Android 8.1.0 Release 28 (OPM4.171019.016.B1)
Merge "Add null checking to two protectFromVpn calls" am: 335d482d9d am: afbdf60e1d
am: 476bfca7f6

Change-Id: I3b88239b8eb7b0c6ce6c747b3f1bbb2fef458d47