Merge "Add NB-IoT inactivity timeout duration for demo mode" into 24D1-dev am: f34e83ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27109061



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