[automerger skipped] Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" am: ecce39622d am: 2be27a8d81 am: 0ed1383af2 -s ours
am skip reason: Change-Id I1600a96a729fc3b555eab5bc80b069663c8eb00a with SHA-1 6f4ceba6ed is in history

Change-Id: I6bbcbee0b1c3be0f1954b200a60556dc15080822