[automerger skipped] Merge "Move enums file to new directory" am: 53cfe5eb...

[automerger skipped] Merge "Move enums file to new directory" am: 53cfe5eb am: 0fd36c48 -s ours am: 3e8d93ee -s ours

am skip reason: Change-Id I29b21fdc98c6c795902d23f21ef3dfd11d3f3216 with SHA-1 d16df80f is in history

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

Change-Id: I77e4bcd11cc74fb7cbe3a85f23f785210697e679