Merge "db845c: update FCM version to 7" into main am: 6530f33293 am: a2ad6238d6

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2984194

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