Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev am: c06746ce -s ours am: e4e1c11e -s ours" into oc-dr1-dev-plus-aosp