[automerger skipped] Merge "Profcollect: Fix two issues flagged by lint" into udc-dev am: 330484d4 -s ours am: 99cbe4f7 -s ours am: cf8cc613 -s ours

am skip reason: Merged-In I4ac140f3f37c04866d9d88906c26720ce7c71a80 with SHA-1 23609c6a is already in history

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



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