Merge "Handle config changes in DecodeAccuracyTest activity" into oreo-cts-dev
am: add9d74ef9

Change-Id: I0dc3c42ee3c8d455f1734cdbea2e1a20f28a91dc