Merge "Sysconfig: Allow runtime differentiation of product configuration" into main am: c30aeaf4

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



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