Merge "Move constants to MODULE_LIB" am: af1162983f am: fe225d32a0

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

Change-Id: Ifc5436f5729ffcc40d069bfc649091d2b8821a0e