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

Change-Id: I4eb6b4e980a13b5b6fc164b7f7edbd7b9fb059d3