Merge "Support string-array type value for bootstrap atom" into main am: 750041bea2 am: cfd4341484

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

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