Merge "Update UsageStatsSerivce#KEEP_LEGACY_DIR." into rvc-dev am: 35afbf3271 am: 7f4c5c3071 am: 1d0a636b90 am: 6f65d410ac
Change-Id: I73e56f70a3101d8555fc7dc2214c45fdd190c641
This commit is contained in: