Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f am: 45b3c9f280

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: I268445fd2f6f1982273b07f47ae231b1fed776d1