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

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

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