Merge "Attempt to fix bug with setActiveGroup() in FingerprintService." into mnc-dev