Merge "Update UsageStatsSerivce#KEEP_LEGACY_DIR." into rvc-dev am: 35afbf32 am: 7f4c5c30 am: 1d0a636b Change-Id: I9a3d1a4a59fdf2ba8624cbdf3694f15f2f0a6745