Fix disable2 bug

Cherry-pick from Iadb6aec82ccfe95a90e4a3d212fbd14d73093982, which was
submitted to AOSP-master.

Bug: 27688623
Change-Id: Ie386b9aac1338316dfdb55dae6a6d9388062b4c3
1 file changed