Test: Tested in an Android Q device Change-Id: I388b8108df482837dabc7c042e4fb0a0004af625
mentioned in commit 0cf99651