Merge "Revert "Add persist.dumpstate.verbose_logging.enabled to system/...""