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

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

Change-Id: I514f5a3d1a4b1498f58170ac652ede394ddf6aeb