Merge "Mark /data/server_configurable_flags as encrypted" am: 4e2c4e8960 Original change: https://android-review.googlesource.com/c/platform/system/server_configurable_flags/+/1159083 Change-Id: I130c4965bab2f8b579086ef7977de78bd7a1ebef