[automerger skipped] DO NOT MERGE Set module versions to 299900000 Dev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules. am: e5d6ecfd
am: dcc0e4db -s ours
am skip reason: subject contains skip directive

Change-Id: I8bcd1a5dd704f197a09953c3fe70fd4df1ba2e0f