type safety for bool optional am: f2466ef4bb am: 7b23abd945 am: 869de8c2fe

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775543

Change-Id: I6f4453b3ff329a52bb8dc706968aeaf65f5fe724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>