aefcc5a300
This reverts commit 96cc3c533c.
Reason for revert: Causes back to close sub-settings (b/191257243).
Change-Id: I3aa01bed1d73874176fc2568bac4ca714e9f2df7
Bug: 188565060