Merge "Inline two constants from CorePlatform" am: dbf1544b68

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

Change-Id: I9888625f7e797b23b1a860cb6f076a6860428f27