Merge "Update UsageStatsDatabase#KEEP_BACKUP_DIR." into rvc-dev am: cd2b3bab am: ac0dd9d3 am: 9aa9c580 am: 5ad85ac7 Change-Id: Ia4f1098c0950d4688e566fb623b3117bf5a5c3cf