Merge "Due to b/174645163#6, remove Apn.KEY_PREFIX from incompatibilities.txt" into sc-dev