[automerger skipped] Merge "Fix KNOWN_CODENAMES javadoc to mention that all...

[automerger skipped] Merge "Fix KNOWN_CODENAMES javadoc to mention that all codenames are there." am: 8f721b92 am: 79f8886c -s ours am: 22caf0e6 -s ours am: aa32b3c5 -s ours

am skip reason: Merged-In I93cade7cb11e34557445b74d1e1841508061d616 with SHA-1 82d33f26 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2072000



Change-Id: I9dd4b4d08748f95eec74a9164a01451b43f8cd17
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>