Addition of new config items causing CTS failures

When new config items are added in between exiting ones
it is causing CTS failures with resource id mismatch.
Fix: Move the newly added config items to the bottom
of config.xml file, in order to maintain resources
ID equivalent with AOSP config.xml file.

Change-Id: I3caf68e6b902f82bf215bdb4387f19a593202278