Merge "Sysconfig: Allow runtime differentiation of product configuration" into...

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

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



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