Merge "Update the bug component for blobstore" into main am: 6dbe4c0182 am: 01ac28ad02

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

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