Merge "Set ro.fw.mu.headless_system_user with PRODUCT_SYSTEM_DEFAULT_PROPERTIES" into qt-dev am: ce87586f00
am: aecb7a2c7d

Change-Id: I9eb18c233a9712f1df0f0cd8df0f26c3264fc040