[automerger skipped] Merge "profcollect: Fix possible NPE in...

[automerger skipped] Merge "profcollect: Fix possible NPE in ProfcollectBGJobService" into tm-qpr-dev am: cd32f20a -s ours am: 79626fb2 -s ours

am skip reason: Merged-In I171a0031db104d2c008ee7ef9709f15f76d70b1a with SHA-1 d3b21f91 is already in history

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



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