Bug: 117924132 Bug: 141246285 Test: lunch blueline-userdebug; m checkbuild Change-Id: Idefa10b5bdeaff69496bc66730a7398258f3a38e Merged-In: Idefa10b5bdeaff69496bc66730a7398258f3a38e (cherry picked from commit 1b5e241b9217c4d8842925a29d1ca4228329538b)
Bug: 117924132 Bug: 141246285 Test: lunch blueline-userdebug; m checkbuild Change-Id: Idefa10b5bdeaff69496bc66730a7398258f3a38e Merged-In: Idefa10b5bdeaff69496bc66730a7398258f3a38e (cherry picked from commit 1b5e241b9217c4d8842925a29d1ca4228329538b)