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

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

Change-Id: If6df2836e323f94f99c4fd1a629ff015253a11b2