Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" am: ecce39622d am: 2be27a8d81

Change-Id: Ia5c3e5043d885812fa013caa7b0786819ec81e5c