[automerger skipped] Profcollect: Fix two issues flagged by lint am: 9d165457 -s ours am: 1dd2d4d3 -s ours am: 751c9c4b -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: Id85a6d6751f2eb9ebf44f2fb20a1ece17e926f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>