[automerger skipped] Merge "Delete DhcpResults from frameworks/base." am:...

[automerger skipped] Merge "Delete DhcpResults from frameworks/base." am: e8a29156 am: e0235317 am: 025041f3 am: 8a847006 -s ours

am skip reason: Merged-In I356ee7b24613e84b8a90ddccd6d25d0742d13ae7 with SHA-1 a2ea37e6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972384

Change-Id: I38c050ca9aa1b84259628c99de7c79718cec5ae8