[automerger skipped] Merge "Added the missing constant to intdef" am:...

[automerger skipped] Merge "Added the missing constant to intdef" am: 9df3f378 am: 501a9357 am: 31cfa799 -s ours

am skip reason: skip tag Change-Id I705b56e158dd66cb8084b1efa5f1e7f2195295a2 with SHA-1 79593b16 is already in history

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

Change-Id: I16e1e4b6da82f05ea382019123a8b51ac456760d