Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" am: b124bea782 am: 60246acdbf am: a76f1cbd1d" into oc-dr1-dev-plus-aosp