Merge "Deprecate Patterns.IP_ADDRESS" am: 4eb4e375f7 am: 442a80ba19

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba9a71ed4aedecee2e949ef3e22ce38622ce5097