Merge "Speed up the subscriber" into main am: 09779f9f28 am: cb19cd9496 am: 34e12eba2b am: 22d5d81c9d

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2752586

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