Merge "Speed up the subscriber" into main am: 09779f9f28 am: cb19cd9496

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

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