Merge "Remove stray newline from err() calls." into main am: 086247fdbf am: 66d5fcd69b am: 21c2681859 am: 407485372d

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2745935

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