Use RELATIVE_PATH / DISPLAY_NAME instead of DATA on Q

Bug: 128868297
Test: Manual (on P & Q devices)
Change-Id: I19810f21bab1f6ddc1818f51ab7a6fe252267af6
1 file changed