[automerger skipped] Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" am: e5fce6cd am: b9c19ad4 -s ours
am skip reason: Change-Id I78ca88758998e440bea72ba2d56d90eea3ec99ae with SHA-1 424175d7 is in history
Change-Id: I9ea79827063dfc61beb90c8f29a2bd8d8843814b