[automerger skipped] Minor cleanups in VPN am: 3c499c5c0a -s ours am: 91f55d2c38 -s ours
am skip reason: Merged-In Ib3cbdbfa594c55c27b78dffc00a82d371ca7a749 with SHA-1 3491796336 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19089116
Change-Id: I31cb9699ac0898616036b42967f4fd25c12d7bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: