[automerger skipped] Merge "SF:Report active config to java framework" am: 8e929406ee am: ee8a689009 -s ours

am skip reason: Change-Id I5bb964572d93e5cb78d7b75054b900917be563b0 with SHA-1 3f6a206212 is in history

Change-Id: Ic98c1a01eaa8050f49f2d7575816c7e15587268e