Merge "Added the missing constant to intdef" am: 9df3f37868 am: 501a9357c1

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

Change-Id: Id9e45d545e5c7273b07f6c38922f62a913bb8fff