Considering to mainline moudle to move some resource to v31

- mainline module team have concern about backward compatible on
  old platform.
  To reduce the change, we move most of change for Android S to v31
- Rename resource name to avoid build conflict in another path.

Bug: 182179573
Test: manual
Change-Id: Ic377c8cde7794e9088dad8b066ae7a9c377f8d5f