Merge "Minor update to use temp type instead of deviceInfo.getType" am: 1ba1106d11 am: 6824ce3537 am: 60c4177b58 am: 403fe34399

Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2504413

Change-Id: I93f62d9d01f86949c69081ce1369db77f2b87c3d
Signed-off-by: Automerger Merge Worker <[email protected]>