Merge "Remove @ModemCount enum definitions." am: 349a19d904

Change-Id: I4671d85bdb5b3e2ea9a56902e2ac9eeea5d1785d