Merge "Use String#lines() rather than String#split()" am: 2ac252fb am:...

Merge "Use String#lines() rather than String#split()" am: 2ac252fb am: c070386f am: c60c3a59 am: f6ba6f8c am: f88347bd am: a2da5d02

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



Change-Id: I183f10747dc9b06c664ecc3a69a4eaf6025dede7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>